Auto merge of #1222 - alexcrichton:update, r=alexcrichton
authorbors <bors@rust-lang.org>
Sun, 25 Jan 2015 07:48:47 +0000 (07:48 +0000)
committerbors <bors@rust-lang.org>
Sun, 25 Jan 2015 07:48:47 +0000 (07:48 +0000)
commite0468dfbbb09254e40fd0ad8e8ff1d12c1a5fedf
tree5d10cd1b3b24eab55198ce7962594301351092f4
parent464d8f427b65ce462ada50f3da4d7c0d3e28b7c4
parentd73a110d369068d0d28eb079af7620bd65032f79
Auto merge of #1222 - alexcrichton:update, r=alexcrichton